Backport r108098 from trunk

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 98a775ffa4db6bdf827449037d503d5cafd6c934..9a3266a4c704d9f2f0dd8ceb8a43784ace3e3b47 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-02  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacsclient.c (min): Undef before redefining it.
+
 2012-05-02  Jim Meyering  <jim@meyering.net>
 
        * emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 931f6d10c5c9e620bc3ed73180f8078e04fab507..c2b0a80c67058875b564417301457cb7b4ae5efc 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -119,6 +119,9 @@ char *(getcwd) (char *, size_t);
 # define IF_LINT(Code) /* empty */
 #endif
 
+#ifdef min
+#undef min
+#endif
 #define min(x, y) (((x) < (y)) ? (x) : (y))
 
 \f